remove conflict marker
authorSøren Sandmann Pedersen <ssp@src.gnome.org>
Fri, 22 Feb 2002 13:35:03 +0000 (13:35 +0000)
committerSøren Sandmann Pedersen <ssp@src.gnome.org>
Fri, 22 Feb 2002 13:35:03 +0000 (13:35 +0000)
commitfb291194e1a4efa9d7a4bede8441c4ea719f1e2b
tree9260edd9be27ba87637726e44320211cca8d3983
parent5d81847f201c1a25c9edf5e522c6f3d12bdb2533
remove conflict marker
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8